From: Tim Deegan <tim@xen.org>
Date: Thu, 2 Feb 2012 15:47:26 +0000 (+0000)
Subject: Fix x86_32 build
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=6e05ed0925434a36026ca717c55b55243a3222b9;p=xen.git

Fix x86_32 build

Signed-off-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/common/memory.c b/xen/common/memory.c
index b47e2447c7..489c9a620b 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -182,7 +182,7 @@ int guest_remove_page(struct domain *d, unsigned long gmfn)
     }
             
     page = mfn_to_page(mfn);
-#ifdef CONFIG_X86
+#ifdef CONFIG_X86_64
     if ( p2m_is_shared(p2mt) )
     {
         /* Unshare the page, bail out on error. We unshare because 
@@ -192,8 +192,8 @@ int guest_remove_page(struct domain *d, unsigned long gmfn)
         if ( mem_sharing_unshare_page(d, gmfn, 0) )
             return 0;
     }
+#endif /* CONFIG_X86_64 */
 
-#endif /* CONFIG_X86 */
     if ( unlikely(!get_page(page, d)) )
     {
         put_gfn(d, gmfn);